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

Change-Id: I114cd02f834d95b0cc969593d753af7fd3ff1d13