Sync Py2 and Py3 requirements files

bp python3

Change-Id: Ie6cd87bed5797bb9d845b0d9e9d0fa0410eab5c6
Merge "Sync Py2 and Py3 requirements files"