Merge "Fix code and test related to rules version check" am: a3579d4b am: c506ade2 am: af32c3d2 am: 9b28a61f Change-Id: Ia0e1e74364b9a72d9ec4e7058313c2c26f71d206