Merge "Prevent ConcurrentModificationException while accessing mTunableLookup." into rvc-dev am: 86a72111c8

Change-Id: Ic73eabd20fd9f099a3ca81b456a5fce99928f40b