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

Change-Id: I1c0f50dc9cdf83bce3331f92472d06fb6fb1e27e