Merge "Change to match unregister calls with register ones."