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