When moving to sync on the right objects, these waits() have been forgotten. Change-Id: I61b0d3c5cc41b7f46fbdd3099ec44221e653001a
When moving to sync on the right objects, these waits() have been forgotten. Change-Id: I61b0d3c5cc41b7f46fbdd3099ec44221e653001a