Remove support of Type level StateIndicator
Add interface to support State Type conversion
Add state indicator test metadata