This ensures compatibility with both Python 2 and Python 3. Change-Id: Id9838b7517f939e5ee3e3a8c37ae5ec2e9b1d18b