Merge change I75481cb8 into eclair-mr2

* changes:
  Check that the resolved activity is not in our package.