Merge "Clarify that Condition::wait() can spuriously wake up" am: 514e0aa2e2
am: 675e05c48a

Change-Id: Ib6107e4f31dbf45984e4e318e5a115a8567a358b