Update markings for the OMH changes

Update markings for the OMH gerrit: 478700

Change-Id: I4cdebe5f383efe1153bfc0a58bafb4168106736b
(cherry picked from commit 7adf9268e08978c9a458c98ee3465293e383c35c)
(cherry picked from commit 5ed1fe759759b41a1fa886a35f46ea2984700fdc)
(cherry picked from commit 5db5f0c0f7e5f57c81a0a4fe5a625f98f711a1ab)