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

Change-Id: Ife96928b257e34cefc8b070a4ee58caf067bc9f2