Note: SC colors still need work, this is just to make the semi-merge compile. Change-Id: Iaf144e1ce6f349d10759ba1c22c3dc404dee4768
Note: SC colors still need work, this is just to make the semi-merge compile. Change-Id: Iaf144e1ce6f349d10759ba1c22c3dc404dee4768