Merge "Add format value for NULL offload info" into tm-dev