Merge stage-aosp-master to aosp-master - DO NOT MERGE am: a54deb34ff am: d051af7e55

Change-Id: I4741dc50fa9fc1af795d2b1cf62fffe5d01c6351