Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 87b76bdbad
am: 0743fe8f5a

Change-Id: Icf8da21f5c763ee076d4223ada788fd692f1fc6b