Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 4a7c73e661 am: 4d8217a687

Change-Id: I8fca51467bf1a4ba96f3425d9727bcf2c20bf142