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

Change-Id: Ib4f18e8cc6a6b05fdcf5c50d5b67bf37128bc82b