Merge "Add missing ServiceNotFoundException class"