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

* commit '5401d78fb2741e79441fe557bbc3bfb71fe768da':

Change-Id: I9bbda3bfe4ee95bf26f54ad594cddd72e5fbcefd