Merge "Add support for converting java hint sessions to native hint sessions" into main