am 2eab06c3: Merge "Fix for SafeMedia logic and CTS tests" into mnc-dev

* commit '2eab06c38f1aa34f90c2a4b153a51f3c15310431':
  Fix for SafeMedia logic and CTS tests