[automerger skipped] Improve NFC availability for active UIDs am: ea16ed61ac am: e730d5c42d -s ours

am skip reason: Change-Id Iba99d288a1b9b3391cc1d0861a75045e2d303c10 with SHA-1 ea16ed61ac is in history

Change-Id: Ib2dea8ad2594b1b30599b75472c0b787b78fe5ed