Merge "More path validation for better error message" into pi-dev am: 4f975de2f8
am: b16207c0bc

Change-Id: I19bc692024e9f5ead71e49acaf458aebc733d757