Fix Merged: https://opendev.org/starlingx/platform-armada-app/commit/88570d9f0539c6f3827fb708c65e5f497e5ce776
Fix Merged: https:/ /opendev. org/starlingx/ platform- armada- app/commit/ 88570d9f0539c6f 3827fb708c65e5f 497e5ce776