Merge "Remove forward matches before checking for default" into oc-dev
am: d53cbfd0dc

Change-Id: I578c7e50fb9fbe84025508c30a86c6ab4865d385