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

Change-Id: Icf6aea130b0687f2ea839c82dff5a5f6cb1c915d