Fix bug where wrong folder contents are loaded

Change-Id: Ie8d6fcf7161bbcdc51462821bbb54653bd6531b0
1 file changed