Make sure we check the correct initial folder(s)

Change-Id: Ie728111edbcfae0ce6bc85dfefe6d2188f730485
6 files changed