Merge "Adding handle types to Java-compatible test HALs"