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

Change-Id: Icdc62e9f44dbbe9628235e34598c81f24c3a7c47