Merge "Fix command line tool to set the right privacy enum."