Merge "Allow relative path as 'local' argument" am: d29c0d62e3

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

Change-Id: I3d8f8f644250073dff5a7d0c65adbdb5da6ea469