Merge stage-aosp-master to aosp-master - DO NOT MERGE

Change-Id: Ibfd2615fde5ed5d7f2a988f6a40f877b58fe7ae7