Merge "Fix copy/paste error in path check." am: cc3a31fbe6
am: 79d073812a

Change-Id: I8f2e9358197f01e920e46671fa370ec48b1b267a