Merge "HAL changes for Passpoint T&C"