am 9d4e681d: Merge "clean up secure CVF" into jb-ub-mail-ur9

* commit '9d4e681d5e44b8f47fdee2f13fba02a34ae8315b':
  clean up secure CVF