Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 6b25dfb882

Change-Id: I3c050a4a9796af121ad371e8d5d49ab992f49bb3