Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 4830ff59e0

Change-Id: I3cd4b9498d45030933b2deab5c1c9e0175af4efe