Fixed issue with failed OSTF tests

Change-Id: Ife17c274fed3be2fbfdb6f83a39fef2b311ca280
Related-Bug: #1264292
Merge "Fixed issue with failed OSTF tests"