Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 8f93b3ab37

Change-Id: I9b3e53254e514df64e0df6858bb726a603bb699d