Merge "Fix bug where a starred contact couldn\'t be removed" into nyc-dev
am: eb66b0feee

* commit 'eb66b0feeeefd4e6362f0b5063978a6c057606f5':
  Fix bug where a starred contact couldn't be removed

Change-Id: I12a76d5dc73101bec87a05d3fab04f6d0be664a6