Merge stage-aosp-master into pi-dev-plus-aosp
am: 9ca91b564d

Change-Id: Ib5674e02e7b6a6fe8b739b0c8491c9ec1bcca00a