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

Change-Id: I301fc09f3a9316987a2bc9548178b16a68cc5752