Support internal redirects

Bug: 69020
Change-Id: I88f847b488d57c3c3f4dab6bac6cd41a371640de
Merge "Support internal redirects"