Merge "Update CtsShim with multiArch" into oc-mr1-dev