Merge stage-aosp-master into pi-dev-plus-aosp
am: 60f46f56f4

Change-Id: Ic590f1a2fce121353a35997df0e995ccf131ffd4