Merge "Set the package name when starting MailIntentService" into ub-gmail-ur14-dev