Merge "Allow leading spaces in path string (to keep behavior consistent)" into nyc-dev am: a184abe
am: 61ce25a

* commit '61ce25a24bf55c476bcd034a6f5dda7c31ca28af':
  Allow leading spaces in path string (to keep behavior consistent)

Change-Id: I743fbcecce8851d26e17753ff1b8e336648c1c9b