Merge "Remove pairing_auth, pairing_connection from recovery." am: 736aa9090e

Change-Id: I35ffbb402b920fd219898b08f0c0c331450812d6