Merge "Use different versions for framework compatibility matrix" into oc-dr1-dev am: 40834bbf0e
am: 5fa98ed9d3

Change-Id: I46b914c85652d3651f5cda6b97810816ad074fd9