Enable OSTF for error environment

Closes-Bug:#1316127

Change-Id: I0f8bba099b54a59efc359240171a6883023c9dd2
Merge "Enable OSTF for error environment"