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

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

Change-Id: I2d0cf79e1b3253db03045692b8db82f3e67e3bb5