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

Change-Id: Ia3960a63c9da8953e1464c4a49f0e94746441ddb