Merge "Merge "Remove unused methods from OMS" am: fd5cdfc924 am: 55a2494df3 am: 5e9775cb59 am: 1602ae8f47"