Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 9f936d5a2f
am: 115d25c27b

Change-Id: I6686b9ddd98b4a22e7b196719c189d9473ff5146