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

Change-Id: Ic8771054afb8c81f7ded84f9aa5b42af0356f167