Merge "Handle the case cwd has a trailing slash."
am: c101222c85

Change-Id: I06c02458bf49b08adb25bb0f23572d0f57165b83