am 3b3b2efb: am fff175ae: Merge "Part of corrections from KLP API Review: Media" into klp-dev

* commit '3b3b2efb077b56f65a9c48c95f8dfab9af5ec531':
  Part of corrections from KLP API Review: Media