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

Change-Id: Icb849d7baf9335c6779b395c76844c4f02aff5e8