Use Statement rank enum

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