Merge "Fix issue with 32 bit versions of asyncio" am: 71be3d9a6f am: 0500ce7ed2
am: 2347a1f847

Change-Id: I229fb80ead478a12c773e0154304bb48a52eaff2