Merge cherrypicks of ['android-review.googlesource.com/3000745'] into ndk-r27-release. Change-Id: I692e910382b134e6c4a2f1037668698e5e1ea22d