Merge "Update CP2 icons to match contacts" into lmp-dev