Merge "Added extra validation for invalid paths." into nyc-dev
am: 40297c1a9c

* commit '40297c1a9ce076797d2576e96fbd2f0d76eef1d5':
  Added extra validation for invalid paths.

Change-Id: Ic0bfe4e1aa967b7b3b4a8a4c32dcb85813f9c551