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

Change-Id: I418f3e7c1f67fd628293f6b09d06464f860a99d9