CV header polish. Fixes b/16137792.

Change-Id: I84fb3590ae78a4ad0b261539badb87ab30ca2607
4 files changed