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

Change-Id: I4440660da3ce8d430b5d606bf819a982df8ffd83