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

* commit '56ffb6e7b1e30dccf098a17843456870d4d48c86':
  Fix info leak vulnerability of IDrm