Merge "release-request-1f23c1cc-67f0-4164-92f6-7dae0712394d-for-aosp-emu-2.4-release-3972579 snap-temp-L97500000060558537" into emu-2.4-release