Merge "Explicitly Select UID for Target SDK Check"