Merge "Fix exception when path not found." am: 39e706e507

Original change: https://android-review.googlesource.com/c/platform/development/+/1960330

Change-Id: I17048ce8703293c07d9110db1e935b0d19594531