Bug revert AOSP cherry-picks to enable big diff. am: 46f41134 am: bbd7ddaf am: 1373b2fe  -s ours
am: feef1427

Change-Id: I168f6e61a31b047a3f7a858edbcdbaefef30ff24