Merge "Migrate reader writer based tests for HAL 2.4"