Merge "- Public part of the Metadata API. - Modify the media framework test for Metadata."