am 80952e03: Resolving a race condition in upgrade to Froyo

Merge commit '80952e03e425a04ea2fd77e3ff44a8453ffdefe1'

* commit '80952e03e425a04ea2fd77e3ff44a8453ffdefe1':
  Resolving a race condition in upgrade to Froyo