Merge "Factor out code for updating notes branches to NotesBranchUtil."