Merge "Support HAL v3.0 in inject_psds_data"