Fixes breackage in python3.5 due to underlying system upgrade. Change-Id: I36b5fb637b7daee782a54b02da676cf75ea19e8f