Merge "Update sensor posision for O6"