Merge "Prevent ConcurrentModificationException while accessing mTunableLookup." into rvc-dev