Updated from global requirements

Change-Id: I3127fad5b4caff2122b0a0f0d9ec3312f1eca7d5
Replace xrange in for loop with range

xrange is not supported in python 3, so replace it with range.
It's not a large range size, so no need to use six.moves.range.

Change-Id: Ie62c3f1651d98f6b7d9a70fa1b485a9a04fd758f
Closes-Bug: #1264182
Merge "Updated from global requirements"
Merge "Replace xrange in for loop with range"