Merge stage-aosp-master into pi-dev-plus-aosp
am: 8992652a8d

Change-Id: Ibbd1b67df89abe9531a2f4943b212293debdc2fb