Merge "Add KeySyncUtils"