Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 5eb772bfa5

Change-Id: I1764f7ed17b7b20eed30fca080b9a620db3efab5