This reverts commit c55ac92bd6. Reason for revert: Breaks down-stream branches. See b/140315617 Change-Id: I4937fdf4bdcc7a44d5f10700ecf2d5e96aef7d27 Merged-In: I8da93f2c9b95183e32d4a2ea895f90c449abbe4d
c55ac92bd6