Merge stage-aosp-master into pi-dev-plus-aosp
am: 6eb778c27d

Change-Id: I5176a8a494ce8873c5e5a074209e512842573dc7