Merge "Eliminate the APEX name in fs_config using wildcard"