Move autosetuprebase to where it will actually do something useful

Change-Id: Ie608974b10217ffb716349562805acdac2705232
Merge "Move autosetuprebase to where it will actually do something useful"