am bb137ce7: am 71fb3cfa: am c8bd00d2: Merge "Fix star/unstar on empty contacts by stopping caching them" into lmp-dev

* commit 'bb137ce781e26be3d76b8b49a57f894033c498f9':
  Fix star/unstar on empty contacts by stopping caching them