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

Change-Id: Iae66a8d960487cdb712e0d8d2f53736391f5763f