Merge "Cumulative patch from commit a9491695b30a7f750dc45cb563d813b03f1d4b8d"
am: 22b351bc7b

Change-Id: Ic5179674c43b9b1263cbbfceb6f7e24cf9653608