Merge "OMS: fix checkstyle warnings"