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

Change-Id: Ica574b5f8db25b3f793dfe0fbe9c8c70d5acff9d