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

* commit '85437c7d57a4a477b61fc1428aa2ae722026ef82':
  Fix for SafeMedia logic and CTS tests