redirect more paths

Change-Id: I1527081538d0b63e7dfc173d6a5584ba705a15bc