Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 6a79fb47e4
am: 506b9834d6

Change-Id: If07c10bbca64e8dd34451b8527df49157bf49a4d