am 30646d87: am 67142495: Merge "Fix MediaStyle API comments" into lmp-mr1-dev

* commit '30646d87f240cd17917ad6d1ae83306d284b58b5':
  Fix MediaStyle API comments