Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 29fc5cb2f2

Change-Id: Ibcb88b4a2350d371469b758454f0590f86745a82