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

Change-Id: I392213b405efb58d8aa3fb3b2151280d4426d380