This makes us possible to leverage version comparison instead of search. This also might come handy in the future when we need to be more specific of expected versions for upgrade process. Change-Id: I7a132145bc781db999f82ecb192e6e1ecfc9c0ad