Change-Id: I468e42b91996aad348fa0a1c85e0bc66597cf440
TICKET: CYNGNOS-2299 Change-Id: Ia6c6a1ee901f4f94446c379cbceabfdfced651ef