Merge "Refactor/tweak FileSystemsTest." am: e4f46d9bba
am: 329324a922

Change-Id: I1f365443b8417b5d5e2b486b07cd82792043eb37