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

* commit '932d61d9ae1f5ede45702c381694880cfb6d700b':
  metrics: Fix import paths for headers.