Merge "Snap for 8018583 from fe9a8b11e7594a8d9aa90ef0f584ec4dc8c0031d to ndk-r24-release" into ndk-r24-release