Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: db7d5f301b
am: 791d498cb0

Change-Id: I97fad93e78f7d343c696da0292968778604bbb72