Merge "Update test for added ServiceState APIs"