Merge stage-aosp-master to aosp-master - DO NOT MERGE am: f8e2fd922c am: e0e0ffbaf6

Change-Id: Ic2e22a377698f8440dffe51c7d4b7125941223ee