Fix folder order regression (issue 6482634)

Change-Id: I8246450ec857d0653c65d9daaf7a8b771de6c974
1 file changed