Merge "Fix bug where a starred contact couldn\'t be removed" into nyc-dev am:...
Merge "Fix bug where a starred contact couldn\'t be removed" into nyc-dev am: eb66b0fe am: 097cb40f
am: 73849c7b
* commit '73849c7b':
Fix bug where a starred contact couldn't be removed
Change-Id: I6f1cf92c1ff2e33d3d576f794608f89d6c16bb92