Fix rootDirectory

Change-Id: I7a5d3bddd8fcd226d022bae288d732324ca4008e
Merge "Fix rootDirectory"