Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 0e17a8f6e2

Change-Id: Id077929782193a0c36f0192b2b7adc4134413918