Merge "Allow relative path as 'local' argument" am: d29c0d62e3 am: 51b5b225ee am: 9f5a34ac04

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

Change-Id: I2377577948a720dd107fe9c146eede78e418a689