Merge "Fix code and test related to rules version check"
am: a3579d4b84

Change-Id: I2021e64f04e0e55de21dcdc0a932ce535e6a7f9f