Add support for python3 am: dc6654af61 am: f61c4b89eb am: 33fb48d361

Change-Id: If263c99df3f92933894a9cf8554025c1c986cd67