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

Change-Id: I73344aab7a85ff0ec810c193adb48b152805dfae