Merge "Add sample_updater style check to PREUPLOAD.cfg" am: 73e6644777 am: 11e31203a6
am: b21a990e75

Change-Id: I1151d68bd755d05cc454bfbaf7d5c55c1e289340