Odin Changes

Change-Id: I669f3dfa812bddc4030f714d62e9d45e3054803e