Merge "Fix issue with 32 bit versions of asyncio"
am: 71be3d9a6f

Change-Id: I6d0bb90c36b47ccc8d50c3b38c910ab9943cc69f