Merge "Update servicechange-handler goals"