Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 7330b31178 am: ffc35de479

Change-Id: Ic59f838ba1a2db06b3940f1d90ae08f7cdde6b54