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

Change-Id: If5bf5e3a128e8d69ce108663e0c3b43fce7bbd4c