Merge "OMS: fix Javadoc copy-and-paste error"