Merge "Address NDK API review feedback" into main