Merge "Add Diagnostics Oid in HAL." into tm-mainline-prod