Merge "Merge cherrypicks of [1317624, 1317625, 1317626, 1317627, 1316664] into ndk-release-r21" into ndk-release-r21