Merge "Fix some policy-base routing issues." into ics-mr1