Merge "clean up secure CVF" into jb-ub-mail-ur9