am 6dc499c6: Merge "Save and restore media metadata." into klp-dev

* commit '6dc499c6da2affa427dc982e5a50ddf3cb9d5aa9':
  Save and restore media metadata.