Fix Python2 specific use of iteritems.

Change-Id: I3e741523eb0b9a07ef7d6e1f6003f81f906c2af7