Fix python2 specific iteritems.

Change-Id: I7f61a07997e97c3dc5985712578251f22d0e7256