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

Change-Id: I941282f31f8f423b2ceadec6114c25b214e6bb37