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

Change-Id: Ia0e1e74364b9a72d9ec4e7058313c2c26f71d206