Merge "Set OS_TEST_LOCK_PATH default value in fake_config"