Merge "Merge cherrypicks of [1892798, 2094903, 2095084] into ndk-release-r23." into ndk-release-r23