Merge "Some minor code cleanup" into ub-gmail-ur14-dev