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

Change-Id: I7f7788985bc5c491fc0a1c833b4ab546cfed19f3