Merge "release-request-348230ef-823f-402e-b379-76791af4b533-for-aosp-emu-2.5-release-4333248 snap-temp-L07000000102159225" into emu-2.5-release