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

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

Change-Id: Ic0b84f0b683a73b317945507335843cd2ecf1139