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

Change-Id: I1eafc2db6e0118499192fa279459eca51f621024