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

Change-Id: Id7fdac97cd7f67f24c49f0dc0da928f12fed1550