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

Change-Id: I284f579e1e1c47090d9998c45c710cbc3108db0b