Make sure we check the correct initial folder(s)

Change-Id: Ib6881dbf5927d655dc1c7dd1bb2a53d7384303af
4 files changed