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

Change-Id: I561cd2e009c43348532a4a2fdd8253ae40adfeb1