Merge "Add StatementService to the build"