Merge "Update Nfc system config search rule" am: 1c5439a24c am: f2c9253f50 am: e1959b80b9 Change-Id: I0144f485d8d2bbdc3e1f484bef5dc6cdc4845f86