Fixes SWDEV-465215, SWDEV-465213, SWDEV-465212 Change-Id: I08b114bf647366abcf900d6b2a17f77ca608fc46
Change-Id: Ie817859ef51701a3758dd44736e947c5b20c2d46