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

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