Merge "yet another race condition fix to address bug:2456970"