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

Change-Id: Ia7f6b42c8a6c0dfbacf36449f66c67fe706d6e79