Merge "Fix info leak vulnerability of IDrm" into mnc-dev am: 56ffb6e7b1 am: 0708170e10 am: 96ddf53162
am: 58a982d1c7

* commit '58a982d1c7a316d1bb8fade837664a412241ba8a':
  Fix info leak vulnerability of IDrm