Merge "Add waitForHwService."
am: 3b41bfec5d

Change-Id: I76e4c0da2068687d98d11f6f5530d7fb3f1e8c5b