Merge "Remove unnecessary pathmap usage"