am 7f15f176: Merge "Fix three harmony tests that failed on Android and the RI."

* commit '7f15f17659ebca0757ce1c7fa3ecd7e8fe074324':
  Fix three harmony tests that failed on Android and the RI.