Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 839b56d04b

Change-Id: I5086e11acaf0565f43246eaa11c7eeaf94066599