Merge "More CV attachment tweaks. b/16138036" into ub-gmail-ur14-dev