am ead37b5c: Avoiding a race condition in testOnReceivedIcon.

Merge commit 'ead37b5c59011a64e83988ddef0ffb0ed1aba9b1' into gingerbread

* commit 'ead37b5c59011a64e83988ddef0ffb0ed1aba9b1':
  Avoiding a race condition in testOnReceivedIcon.