Merge "Revert "Cumulative patch from commit 4ec1fd8e42bad9390f14a58225b6e5f6fb691950"" am: cceee343ee am: d4f509040d am: 1373972f53
am: d54c40d52e

Change-Id: I2d0ff022aabc9f357bb719fb0250fadb9dedac8f