Python 3: use six.iteritems()

Change-Id: I9d86dd948bc2241bbb69a04c0024f90b805d7cc8
Merge "Python 3: use six.iteritems()"