Merge "Add comment for thrown exception in waitForDeclaredService"