Comment 3 for bug 1829004

This is related to: https://bugs.launchpad.net/starlingx/+bug/1828271 once that fix is merged it should fix this issue too. Tee merged the change required to fix this. I'll test both issues when testing fix for 1828271.