[automerger skipped] Support a range of major and minor version. am: dcaf797441 am: bb864b7575  -s ours
am: e6f8f61a3e  -s ours

Change-Id: I00e2c1d1ef2b5876c4ae16556f76a1cc74b9e7f6