am 59d3e1db: Merge "Support for additional profile annotations."

* commit '59d3e1db25839547fc7e713d3c86d3329833aabc':
  Support for additional profile annotations.