Prevent overwrite of OS_TEST_PATH

Change-Id: Id0cf9b1a132eb5094f594459cfdb2f1d0bc5c3ba
Merge "Prevent overwrite of OS_TEST_PATH"