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

Change-Id: If55054311c28503b7f937994f0d01fe165d13106