Merge "Remove some unnecessary interface" into ub-gmail-ur14-dev