Register target globally

Change-Id: I468d4eb4532c989f3efb855e8ba6d6f243afaa81
Merge "Register target globally"