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

Change-Id: I4685254f5ab1d3939bdd5f1b6b2f0d20ba1950ca