[TIMOB-17633]: Update java sections properly
Merge pull request #6024 from hieupham007/timob-17633-3_3_X

[TIMOB-17633]: Update java sections properly