am 7cd88ba4: Merge "CV header polish. Fixes b/16137792." into ub-gmail-ur14-dev

* commit '7cd88ba43393f809cd719b80a17198d07c1603f6':
  CV header polish. Fixes b/16137792.