Merge stage-aosp-master to aosp-master - DO NOT MERGE am: cd3459f07b

Change-Id: Ib8bcc0f2e0153a7cee09b1cf1ce4aa6b9ddd9241