Merge "Fix to handle ConcurrentModificationException" into mnc-dev