Merge "Add hint to OT_* defines"