Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE Merged-In: I51828886b476522a8d9d2c726ee7785465d31fd2 Change-Id: If44be2f871dfe2a2a857720624b00a0605d0b3d4