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

* commit '44e9c027958ef5d7f8c8a06137ff9832b43114fb':
  Fix use of invalid iterator.

Change-Id: Iaf425573fa29066179a12914eeec9bc90a5fab62