Update based on odin

Change-Id: I8e65b98dee12e25b68ae62e839a309a6295c6dc1