am dc15f4cd: Merge "metrics: Enable for non-official builds."

* commit 'dc15f4cd926a35e4b2f85804fbad218a90365abe':
  metrics: Enable for non-official builds.