Merge "icnss2: Add support for MHI state info"