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

Change-Id: Ic18c84dc2c382560a8b44e24ecda315c1a2797cd