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

Change-Id: I0a2bfeea14dcf8f2f16f007692ba9b4e51fc1856