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

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

Change-Id: I8cf6be341c3fa5e64629d1ae202cdfc88e1057f7