am 2b791cc2: am 910363bd: Merge change Ib5dc3f1f into eclair

Merge commit '2b791cc256e80f93fef7db2157f1cee202133201'

* commit '2b791cc256e80f93fef7db2157f1cee202133201':
  Fixing a lame test that was relying on hashmap iteration order.