Merge stage-aosp-master to aosp-master - DO NOT MERGE am: a71e010a66 am: 91c4629d3f

Change-Id: I63b3829726920ee2e3bb93bea7ca5d5c13f827db