Merge "Add waitForHwService."