am 31ffc571: Merge "Update profiling properties"

* commit '31ffc5713913062c58854b1cc3556547f6681f65':
  Update profiling properties