Merge "Move text coretests to JUnit (1)" into oc-dev
am: e0857a5800

Change-Id: I295b78a4397bb6409eef1963362b766c0ea78640