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

* commit '96ddf53162ffdef3e47a99bd0480b00678c0273c':
  Fix info leak vulnerability of IDrm