Merge "Remove unimplemented and unused service declaration"