am 4f20a360: Avoiding a race condition caused by configuration change during FroYo upgrade

Merge commit '4f20a360a2f0a7a83900c28fc7728542b38d8939'

* commit '4f20a360a2f0a7a83900c28fc7728542b38d8939':
  Avoiding a race condition caused by configuration change during FroYo upgrade