Merge "Cumulative patch from commit a9491695b30a7f750dc45cb563d813b03f1d4b8d" am: 38356f2024
am: 380cad5629

Change-Id: Iebab88495221dc7d3c9de8bf21eec28f5758e22b