Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
am: 9547eb83f8

Change-Id: I21d57e3ec27703a22dc805ecc947f892d0e30790