am: 40297c1a * commit '40297c1a': Added extra validation for invalid paths. Change-Id: I31fa1fdcd0fad0b27c231f5c1ff6f329b6576270