Merge "Fix ClearKey session leaks" into rvc-dev am: 8d2942ed96 am: 390ae900d7 am: 1e140df985

Change-Id: Id3d8476d4de82c46edb0ff8590c509aa0138e873