Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 917b666966

Change-Id: If126109411453044f0f264103a597928d8df9159