am a8b959bb: am 932d61d9: Merge "metrics: Fix import paths for headers."

* commit 'a8b959bb919366e99804f8f93bbb4511ee97d34c':
  metrics: Fix import paths for headers.