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

Change-Id: I31d6742447a0d78d89dba1ae8bc88e4d190a76f0