Merge "Whitelist MediaProvider for statsd metrics" into rvc-dev