am db9230a3: am ead37b5c: Avoiding a race condition in testOnReceivedIcon.

Merge commit 'db9230a3fffa563bc173f416743acf49f0d9b6b5' into gingerbread-plus-aosp

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