Merge "Implement new clock wait functions" am: 7e958d0ce0 am: 32531b709a
am: d96e7a2f44

Change-Id: I444e6d2ea3a71e3fe4ee327255fddae197221324