Use Statement rank enum

Change-Id: I4bbcb43131be2dd723c8f272abd5ecec29518654
Merge "Use Statement rank enum"