Fixes in directory search ordering

Change-Id: Ib92a65c1e27bd8d2b66bee0f6799c3c1a6cabd19
3 files changed