Issue-id: CYNGNOS-2566 Change-Id: If88d2d62b5d2175ffe857d45dd9f6ce132129f2a (cherry picked from commit 635504813a)
635504813a