am 182673ec: Merge "metrics: Cleanup the system profile setter."

* commit '182673ec6cd7538661cc76a984cded725d03f456':
  metrics: Cleanup the system profile setter.