Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 42ac06e560 am: 52d940cabb

Change-Id: I8343be9e62514bd7bac9a2cdb7779b3b03f4c5d8