Merge "Prevent WaitForProperty() from using ~100% of CPU time on 32bit builds"...
Merge "Prevent WaitForProperty() from using ~100% of CPU time on 32bit builds" am: 7c6b0242 am: b94bff1d
am: 37fe697a
Change-Id: I289bb1f2621b37986ed12522974e585e01571dc5