Merge "Move text coretests to JUnit (2)" into oc-dev
am: 2b0d0671b8

Change-Id: I8f5457aacd79bdaf7be72f7cdc082d0c915f61c6