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

Change-Id: Ibd360d250a3e6684450ab10180a22840f79a4267