[Starlingx-discuss] cherry-pick a fix from master to stx.2.0