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

Change-Id: I4b278e106a4a3a24e7ee55e6353872a2f8d54596