This reverts commit 47e53319509474c2f00847ac391dd32776712470. Some how the reverted CL made it into mnc-dev and and master when that was the intention... Bug: 21751387
This reverts commit 47e53319509474c2f00847ac391dd32776712470. Some how the reverted CL made it into mnc-dev and and master when that was the intention... Bug: 21751387