Merge "Revert "Weaver HAL""