Omni changes

Change-Id: If57656520a8b5de62d7f52c674887b5cfac5c97a