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

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