Merge "Log if waitForHwService has to wait too long."