Merge "Snap for 7478747 from f051c6f342d11263eb5e56bf224a8409dfcf0e1d to ndk-release-r23" into ndk-release-r23