Improve NFC availability for active UIDs am: ea16ed61ac

Change-Id: I5f213009ae1e0606bc739aae9f4173791fa9fb28