Merge "MediaSync: fix API comments." into mnc-dev