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

Change-Id: I040fc9410351ffa9f73d9a374d4999cb8265ce38