[automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 917b666966 am: 2d9c7a23b3 -s ours am: 7e7c57bcb6

Change-Id: I1710c0522da2ff470d35795c1cff87d5c8eafb3f