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

Change-Id: I83c00e0f9423d37511d4cae41c5fcf8145e77bab