cppcheck: Same iterator used with different containers

Change-Id: Idc7f16dc4c81857d7a3f508ed830904d90a762b0