Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 558c496c8f am: 13b82149b1

Change-Id: I9b0329591a404ce65163f0e7d70c8330494c9b03