Merge "Updates to TCMS icons rewritting." into rvc-dev am: d53625f660 am: 56b5aad0fb am: 99c15270c6 am: 8e6bd76222

Original change: undetermined

Change-Id: I9bf7d13913aba97bef6ba72db1ef1e790b9911bd