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

Change-Id: I779cf3078e76ee7e4245d41fe935309958829205