Modify for OmniTorch

Change-Id: Ie7d6b5bcbd3906133f669576b0d81a9335b49a5d