Merge "Add states for aodhv2"