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: Ic88aa14c4c7b06f1d64d112bd03201f6b0c21aeb