Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev