Merge "Reflect deleted package from h/i tests."