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

* commit '86121c5f09dae3f58bb91ec05d86445911b47ca6':
  Update CP2 icons to match contacts