Merge "Fix use of invalid iterator." into nyc-dev am: 44e9c02
am: ac97964

* commit 'ac979645609f7c1a73ffbb81d9cd0f2e8e0bf406':
  Fix use of invalid iterator.

Change-Id: I938bbc9ccdbab9afee41da81bb6a029f3dc6e979