Merge "Revert "Cumulative patch from commit a9491695b30a7f750dc45cb563d813b03f1d4b8d"" am: cad6c45da0
am: 3e2126d282

Change-Id: Idd6449fd43f7148eb527a54dfce847531d994052