Merge "[OOF] Bump OSDF to 3.0.2" into guilin