[automerger skipped] Merge "Fix the compatibility matrix with range" am: bed7070e4d am: 43db488d71
am: 0aae00067d -s ours
am skip reason: change_id Ic5ebb7261d2fe8f379d46ebcc0c47efe8dbd3c59 with SHA1 c87be8aace is in history

Change-Id: I397863b10af42c029e1a0a7de3871db00ddba590