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

Change-Id: Idd6cebd4f57844216820336d50a12310b399e78f