Add support for python3 am: 4ebbfecef0 am: 2e69c77cd6

Change-Id: I16be9e7886fdee2c4cc3f0d29d2ec83d814e1dff