Merge "Merge cherrypicks of [1519895, 1519896] into ndk-release-r22" into ndk-release-r22