Merge "Remove unused methods from OMS" am: fd5cdfc924
am: 55a2494df3

Change-Id: Id985902c3eadcacac645ba545ad07fdee9801284