Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 96ca24806d am: 5df4a4efa4

Change-Id: Ie99471ff5c90103790a989bc1c88fc5018ad91b0