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

Change-Id: I54efcbed8641160abd1511b64dcc6082fa659003