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

* commit '0708170e10aa05f8ce590bb9daa23d770e57b130':
  Fix info leak vulnerability of IDrm