Merge "Update Nfc system config search rule" am: 1c5439a24c

Change-Id: Ib1f861772f009f7473d03842341892e7116e62e6