Merge "Update HintManager to use NDK backend" into main