Merge change 6812

* changes:
  Implemented the tracking of the metadata updates.
tree: bdf08569d60f2391092065ecafc80183346e455e
  1. include/
  2. media/