Modify blocking test cases to not proceed without waiting for service
am: fd704122b0

Change-Id: Ie8a79d72f82ec9a8fd887209fe11c166e8c9df1e