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

Change-Id: Ie7c5e4be92b017b80bfe79e5bd725725748d042f