am 1e067a73: am 7fad4ee7: am 8d9ddbe2: Merge change I1f30f3f1 into eclair

Merge commit '1e067a7338949da812ac5c327c6b5d7944e4d297'

* commit '1e067a7338949da812ac5c327c6b5d7944e4d297':
  Fix #2201615: getCallingPackage returns calling process instead of calling package