Implement new nested folder mocks

Change-Id: I7c0c1d41b7a40d83e1237ba31d5f7949945c7e1e
10 files changed