Merge "Fix Gmail unit test"