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

* commit '647d80d15b26cd9b15febdd178db12d933fdd213':
  Update CP2 icons to match contacts