Rewrite any non-controller url

Change-Id: I18a0361e4973d2ad234d24989eedf473f27bd276
Merge "Rewrite any non-controller url" into production