update based on odin

Change-Id: I639a230c763f24e57360967f9a328ceb152cf6c0