Merge "Meteredness should reflect user opinion." into oc-mr1-dev
am: b3592f242d

Change-Id: I953fa8f79bb7bba630b44c910ede99ac35eeda81