Merge "Remove deprecated recoverable keystore classes." into pi-dev
am: 654598b542

Change-Id: I883e6e98285fc9cb05cd46d6f88efda2437655ca