Merge "Uprank colorized FSNs over Conversations" into rvc-dev am: 4ba34ed680

Change-Id: I75a904146c8d204d57aeb88ac99383995ad0fd7d