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

Change-Id: I5067e34175b4920ee7a5112e3c72971ef74710c4