Change-Id: If20700d94775e91f174a1a07e00820ef0a91cd2f
Ticket: OS#1684 Change-Id: I70d3014deb459e0b91a9a92c60710b994153538e