Merge "Address NDK API feedback" into main