Merge "Remove unused methods from OMS"
am: fd5cdfc924

Change-Id: I97fc7e6400a8221c78cf4f94be0089037bcae929