Bug: 19532651 Partial revert of be0e43b7 Change-Id: I99e220328aff985facb920ebcd84ac1a016759b5 (cherry picked from commit d7ad443c)