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

Change-Id: I21dfdd69c6ce0dfaa1afb0181414fb5bd335ede5