Fixes to a couple of places to make the python 3.5 tests pass. Change-Id: I3f4b73b24fbe336ac6c80b7aa224a830ab7e36a6