Merge "Enable EOSTest_M test" into oc-mr1-dev