Merge "Changed multimaps to synchronized multimaps"