Merge "Prevent WaitForProperty() from using ~100% of CPU time on 32bit builds"
am: 7c6b024241

Change-Id: I08851adfbb9a4fa01a65ca1af6a7c41d0643ca1d