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

Change-Id: I2dc13436ceb93eb620dcaaa6d141210dc57ea1fc