Merge "Meteredness should reflect user opinion." into oc-mr1-dev
tree: c5f2f72d800e42ac557eda79d11516041f72ff38
  1. service/
  2. PREUPLOAD.cfg