Merge "System always contains root dir."
am: ca66d989f0

Change-Id: I5b9c26293da91519fceb4c7cf4997996165b45aa