Merge "nfc: Eliminate boilder plate code for recovering service (contd)" into main