Don't remove elements while using foreach
am: e680e66295

Change-Id: I55da207c92542a2860098bd3f955d64c1c84f4eb