Merge "release-request-4137aa7f-55c9-4064-9ed8-adaccbd34f0a-for-aosp-emu-2.4-release-3917748 snap-temp-L59900000055598427" into emu-2.4-release