Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 05994afb60

Change-Id: I3a54887d22889dadd7403b80f0bce614a355a570