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

Change-Id: Icdaf36fbbd53a3b12e189b1b8ed63f7b66bd3fdc