Merge "Add Simulator service."