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

Change-Id: Ib34e772fa17b3d69c5a64a9d85b20e2eba8bba67