Merge "Add retry if test setup fails and check service object before accessing." into tm-d1-dev