Comment 40 for bug 1853017

As recommended by Yong Hu in https://bugs.launchpad.net/starlingx/+bug/1853093 , I am tagging this bug for stx.2.0 as well since the same code issue exists in that release. The fix may also address #1853093 (not 100% confirmed).