Merge "fs_config supports shell wildcard patterns" am: 2210f80e48 am: 4fe80fa336
am: 6e1875ffea

Change-Id: I4d98ab11d077d540eb2b5c3c952296f290c7efcb