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

Change-Id: I50fa0ce5cddf544a04a2a7a27e20c53d84ac0197