Merge "Fix ConcurrentModificationException when addTunable"