Updates for OM.

Change-Id: I4fd360a66193378ce68b69c04415164dd8c928b7