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

Change-Id: I4bfcc04ce2a521157914a03f81768f9e9da81e1f