Merge "Delete folder "model" from OAM repo"