Merge "Actually make fs_path_config / fs_path_config_from_file private" am: 20670249d0 am: a4754b12c4
am: 073c1d442c

Change-Id: I7b04459dcbd4f6e5c7eff826852a9baed6d2716d