Fixed issue with failed OSTF tests

Change-Id: I428ece5d7e0cda6c7c8eb91623018d95b9e4998d
Related-Bug: #1264292