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

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

Change-Id: I7679ecfa5cdd338d6965903158b0e762e20f2f1e