Merge "Add sample_updater style check to PREUPLOAD.cfg"