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

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

Change-Id: I2ec4440f23604a32ad5cb0a7f204b57612a33405