Merk modifications: Thanks Omni devs

Change-Id: Ic06c55b864ef7654bda690e3a18f2c3b607ebb93