am 9c321b14: am 647d80d1: am 86121c5f: Merge "Update CP2 icons to match contacts" into lmp-dev

* commit '9c321b1433ef1ec88e2a195be70c20d28f6b0a0e':
  Update CP2 icons to match contacts