Merge "Add pep8 check to use data_utils.rand_uuid()"