Merge "Explicitly Select UID for Target SDK Check"
am: f55e854090

Change-Id: If259ebee5fa0107603015f02755e138659f8090d