Merge "Fix three harmony tests that failed on Android and the RI."