Merge change I724fc8fd into eclair

* changes:
  b/2317194 Synchronize command queue to prevent ConcurrentModificationException from happening