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

Change-Id: Ic349bde8c693210077a8ec1ad8e3f5d90f0855aa