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

Change-Id: Iaa97b5ca5d791817d6da74b5f053b2a124d35a65