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

Change-Id: I289bb1f2621b37986ed12522974e585e01571dc5