Merge "Fix for SafeMedia logic and CTS tests" into mnc-dev