Merge "Fixes for NDK API Review feedback" into main