Merge "Snap for 10321980 from a5b94248274a18943e35998703a0efba88237f22 to ndk-r26-release" into ndk-r26-release