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

Change-Id: Iab5e2aedea747cbc787fb2ca7082caae857f83a1