Merge "Sync up the DvrConfig struct with Google3"