Merge "fs_config supports shell wildcard patterns"
am: 2210f80e48

Change-Id: I05580991a64280346391c5380f220d4fee1a8210