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

Change-Id: I723e082701e1728b3988ca7fb788a446a8710e46