Merge "[verity] Modernize codebase by replacing NULL with nullptr"