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

Change-Id: I446f3f281f90734747b87fa111fda4d171e6cfe2