Merge "Reduce lock contention, removing unnecessary synchronization." into froyo