Improve NFC availability for active UIDs am: ea16ed61ac am: dfbd44c17a

Change-Id: Iaa4f96955034a0fa7d58ef862675564eba34a1bc