Merge "Add waitForHwService." am: 3b41bfec5d
am: 3f9a9fce4a

Change-Id: I9ba70d87e02a0589be3154f4a6df5fc4bd90be30