[automerger skipped] Support a range of major and minor version. am: dcaf7974 am: bb864b75 -s ours am: e6f8f61a -s ours Change-Id: I00e2c1d1ef2b5876c4ae16556f76a1cc74b9e7f6