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

Change-Id: Ie922a1a605a8b1d8d697713c919d4dd82ffff20e