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

Change-Id: I388b6918f86f3a6ca4e887212f742effd10be866