Merge stage-aosp-master to aosp-master - DO NOT MERGE

Change-Id: Ifcd87eaf20d5a14bc1a67bfc837900818cef4641