Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: e706f47d2e
am: 0771044f99

Change-Id: Ib8aed54b9138fe7875396d1698bb30c10e91613b