Reviewed-by: alanb, egahlin
Summary: Improve reliability by converting the test to Java Reviewed-by: dsamersoff, dholmes