Merge "Eliminate the APEX name in fs_config using wildcard"
am: ea353cab91

Change-Id: Ie24db2e9126cedff0c7320f0d2b4418f4f16c5f3