Merge "Fixed linux fail for test UriFromPath"