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

Change-Id: Ibf59df7e61135d78627030c32c304195b7e3deeb