Merge "Add retries for pcm_read and pcm_write"