Merge "Enable EOSTest_M test" into oc-mr1-dev
am: f11a1ef8b5

Change-Id: I0baada52e4b45620d9b77fc40d8255d1d928f5d4