Merge "Addressed NDK API feedback" into main