Merge "Fix IOOBE due to internal list being updated from remove" into nyc-mr1-dev