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

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

Change-Id: I9ebb6f71302c7d740e3d7bd8758a4943ef452f5d