Merge "Fix a regression in registering for package_removed" into nyc-dev
am: 7be089b74e

* commit '7be089b74e4c8be473caa6fc2c2b0268c5e9d83c':
  Fix a regression in registering for package_removed

Change-Id: Ic98eeddf9b1754b444a11531b2f762614751b111