Merge "Handle race condition in HAL post SSR"