Merge "Don't add duplicate fragment. b/10515101." into jb-ub-mail-ur10