Merge "usecase validator: narrow down the remapping to game use case" into udc-dev