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

* commit '33ea2ce9082b08c729805f8725cdde2f29c23394':

Change-Id: Iac9361fd433e59f3695dbcde23d831fcf16f7285