Merge "Harden Clearkey releaseSecureStops implementation."