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

Change-Id: I209226159b8fc27827e893129766fbdf819c857a