Merge "Merge cherrypicks of [1950020] into ndk-r24-release." into ndk-r24-release