Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 6b25dfb882 am: 10b124b4c4

Change-Id: I7e3db6aa0c16ba707e10c7652d18f69cd5507c5d