Merge "Add color info when upgrading from P and O"