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

Change-Id: I95e35550195daeeb14dcf6e1335c9b865da30e27