am: 884e8e07 * commit '884e8e07': Added extra validation for invalid paths. Change-Id: Ic316aa95263f7e21885c259f4e65a95edc420375