Merge "Fix the compatibility matrix with range" am: bed7070e4d
am: 43db488d71

Change-Id: I8bec84ad46f68213010748db304fcd4b7824724e