Merge "Fix comment." into ub-gmail-ur14-dev