Merge "Add a lock for call read/write operations to avoid ConcurrentModificationException." into sc-qpr1-dev