Merge "Remove an unused method" into ub-gmail-ur12-dev