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

Change-Id: I92a4dbc74f7db567ca1ff2089ad14d148dbf6979