Merge stage-aosp-master into pi-dev-plus-aosp
am: 37bf76692d

Change-Id: Idecec43a4b3343fa6f703de281173e94c27f3e70