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

Change-Id: I4782fbdc56a402c0de372d6cc51848556e89e1d3