Merge "Add min and max supported versions" am: ae4779e254 am: e611741d85
am: 4859177dd9

Change-Id: I8d5501607db18382dec51a7cfa490536a0218406