Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 8c11059c01

Change-Id: Ia0847672c94d62a0e2bbacf912beae8e219950cd