less Omni

Change-Id: Ie0e796c55a9c6832b0e04e350e4e8c453d0f0bf7